bitkeeper revision 1.1159.174.4 (4199eafc-o43U-MPvkSymdEahhBVLg)

Fix panic() so that it flushes console messages and then kills the VM
cleanly (instead of spinning).

diff --git a/linux-2.6.9-xen-sparse/arch/xen/i386/kernel/setup.c b/linux-2.6.9-xen-sparse/arch/xen/i386/kernel/setup.c
index e10a0aaf9795bbad5502427f4837c0aac1a35621..c9574a4311f63e6ff52ccccb5b6cd131390ffac6 100644 (file)
--- a/linux-2.6.9-xen-sparse/arch/xen/i386/kernel/setup.c
+++ b/linux-2.6.9-xen-sparse/arch/xen/i386/kernel/setup.c
@@ -1319,6 +1319,11 @@ void __init setup_arch(char **cmdline_p)
 
         unsigned long max_low_pfn;
 
+       /* Force a quick death if the kernel panics. */
+       extern int panic_timeout;
+       if ( panic_timeout == 0 )
+               panic_timeout = 1;
+
        HYPERVISOR_vm_assist(VMASST_CMD_enable,
                             VMASST_TYPE_4gb_segments);